Change GUI environment to 'Turbo Delphi 2006'.

diff --git a/win32/gui-2/GPSBabel.bdsgroup b/win32/gui-2/GPSBabel.bdsgroup
new file mode 100644 (file)
index 0000000..79cb36c
--- /dev/null
+++ b/win32/gui-2/GPSBabel.bdsgroup
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<BorlandProject>\r
+  <PersonalityInfo>\r
+    <Option>\r
+      <Option Name="Personality">Default.Personality</Option>\r
+      <Option Name="ProjectType"></Option>\r
+      <Option Name="Version">1.0</Option>\r
+      <Option Name="GUID">{FC095690-3F74-478C-9A62-933653FA0F05}</Option>\r
+    </Option>\r
+  </PersonalityInfo>\r
+  <Default.Personality>\r
+    \r
+    <Projects>\r
+      <Projects Name="GPSBabelGUI.exe">GPSBabelGUI.bdsproj</Projects>\r
+      <Projects Name="Targets">GPSBabelGUI.exe</Projects>\r
+    </Projects>\r
+    <Dependencies/>\r
+  </Default.Personality>\r
+</BorlandProject>\r

diff --git a/win32/gui-2/GPSBabelGUI.bdsproj b/win32/gui-2/GPSBabelGUI.bdsproj
new file mode 100644 (file)
index 0000000..4ed89fa
--- /dev/null
+++ b/win32/gui-2/GPSBabelGUI.bdsproj
@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<BorlandProject>\r
+       <PersonalityInfo>\r
+               <Option>\r
+                       <Option Name="Personality">Delphi.Personality</Option>\r
+                       <Option Name="ProjectType">VCLApplication</Option>\r
+                       <Option Name="Version">1.0</Option>\r
+                       <Option Name="GUID">{FD0CBDBD-6E28-44F5-B538-62E52DEF440B}</Option>\r
+               </Option>\r
+       </PersonalityInfo>\r
+       <Delphi.Personality>\r
+               <Source>\r
+                       <Source Name="MainSource">GPSBabelGUI.dpr</Source>\r
+               </Source>\r
+               <FileVersion>\r
+                       <FileVersion Name="Version">7.0</FileVersion>\r
+               </FileVersion>\r
+               <Compiler>\r
+                       <Compiler Name="A">4</Compiler>\r
+                       <Compiler Name="B">0</Compiler>\r
+                       <Compiler Name="C">0</Compiler>\r
+                       <Compiler Name="D">0</Compiler>\r
+                       <Compiler Name="E">0</Compiler>\r
+                       <Compiler Name="F">0</Compiler>\r
+                       <Compiler Name="G">1</Compiler>\r
+                       <Compiler Name="H">1</Compiler>\r
+                       <Compiler Name="I">0</Compiler>\r
+                       <Compiler Name="J">1</Compiler>\r
+                       <Compiler Name="K">0</Compiler>\r
+                       <Compiler Name="L">0</Compiler>\r
+                       <Compiler Name="M">0</Compiler>\r
+                       <Compiler Name="N">1</Compiler>\r
+                       <Compiler Name="O">1</Compiler>\r
+                       <Compiler Name="P">1</Compiler>\r
+                       <Compiler Name="Q">0</Compiler>\r
+                       <Compiler Name="R">0</Compiler>\r
+                       <Compiler Name="S">0</Compiler>\r
+                       <Compiler Name="T">0</Compiler>\r
+                       <Compiler Name="U">0</Compiler>\r
+                       <Compiler Name="V">0</Compiler>\r
+                       <Compiler Name="W">0</Compiler>\r
+                       <Compiler Name="X">1</Compiler>\r
+                       <Compiler Name="Y">0</Compiler>\r
+                       <Compiler Name="Z">1</Compiler>\r
+                       <Compiler Name="ShowHints">False</Compiler>\r
+                       <Compiler Name="ShowWarnings">False</Compiler>\r
+                       <Compiler Name="UnitAliases">WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;</Compiler>\r
+                       <Compiler Name="NamespacePrefix"></Compiler>\r
+                       <Compiler Name="GenerateDocumentation">False</Compiler>\r
+                       <Compiler Name="DefaultNamespace"></Compiler>\r
+                       <Compiler Name="SymbolDeprecated">True</Compiler>\r
+                       <Compiler Name="SymbolLibrary">True</Compiler>\r
+                       <Compiler Name="SymbolPlatform">True</Compiler>\r
+                       <Compiler Name="SymbolExperimental">True</Compiler>\r
+                       <Compiler Name="UnitLibrary">True</Compiler>\r
+                       <Compiler Name="UnitPlatform">True</Compiler>\r
+                       <Compiler Name="UnitDeprecated">True</Compiler>\r
+                       <Compiler Name="UnitExperimental">True</Compiler>\r
+                       <Compiler Name="HResultCompat">True</Compiler>\r
+                       <Compiler Name="HidingMember">True</Compiler>\r
+                       <Compiler Name="HiddenVirtual">True</Compiler>\r
+                       <Compiler Name="Garbage">True</Compiler>\r
+                       <Compiler Name="BoundsError">True</Compiler>\r
+                       <Compiler Name="ZeroNilCompat">True</Compiler>\r
+                       <Compiler Name="StringConstTruncated">True</Compiler>\r
+                       <Compiler Name="ForLoopVarVarPar">True</Compiler>\r
+                       <Compiler Name="TypedConstVarPar">True</Compiler>\r
+                       <Compiler Name="AsgToTypedConst">True</Compiler>\r
+                       <Compiler Name="CaseLabelRange">True</Compiler>\r
+                       <Compiler Name="ForVariable">True</Compiler>\r
+                       <Compiler Name="ConstructingAbstract">True</Compiler>\r
+                       <Compiler Name="ComparisonFalse">True</Compiler>\r
+                       <Compiler Name="ComparisonTrue">True</Compiler>\r
+                       <Compiler Name="ComparingSignedUnsigned">True</Compiler>\r
+                       <Compiler Name="CombiningSignedUnsigned">True</Compiler>\r
+                       <Compiler Name="UnsupportedConstruct">True</Compiler>\r
+                       <Compiler Name="FileOpen">True</Compiler>\r
+                       <Compiler Name="FileOpenUnitSrc">True</Compiler>\r
+                       <Compiler Name="BadGlobalSymbol">True</Compiler>\r
+                       <Compiler Name="DuplicateConstructorDestructor">True</Compiler>\r
+                       <Compiler Name="InvalidDirective">True</Compiler>\r
+                       <Compiler Name="PackageNoLink">True</Compiler>\r
+                       <Compiler Name="PackageThreadVar">True</Compiler>\r
+                       <Compiler Name="ImplicitImport">True</Compiler>\r
+                       <Compiler Name="HPPEMITIgnored">True</Compiler>\r
+                       <Compiler Name="NoRetVal">True</Compiler>\r
+                       <Compiler Name="UseBeforeDef">True</Compiler>\r
+                       <Compiler Name="ForLoopVarUndef">True</Compiler>\r
+                       <Compiler Name="UnitNameMismatch">True</Compiler>\r
+                       <Compiler Name="NoCFGFileFound">True</Compiler>\r
+                       <Compiler Name="ImplicitVariants">True</Compiler>\r
+                       <Compiler Name="UnicodeToLocale">True</Compiler>\r
+                       <Compiler Name="LocaleToUnicode">True</Compiler>\r
+                       <Compiler Name="ImagebaseMultiple">True</Compiler>\r
+                       <Compiler Name="SuspiciousTypecast">True</Compiler>\r
+                       <Compiler Name="PrivatePropAccessor">True</Compiler>\r
+                       <Compiler Name="UnsafeType">False</Compiler>\r
+                       <Compiler Name="UnsafeCode">False</Compiler>\r
+                       <Compiler Name="UnsafeCast">False</Compiler>\r
+                       <Compiler Name="OptionTruncated">True</Compiler>\r
+                       <Compiler Name="WideCharReduced">True</Compiler>\r
+                       <Compiler Name="DuplicatesIgnored">True</Compiler>\r
+                       <Compiler Name="UnitInitSeq">True</Compiler>\r
+                       <Compiler Name="LocalPInvoke">True</Compiler>\r
+                       <Compiler Name="MessageDirective">True</Compiler>\r
+                       <Compiler Name="CodePage"></Compiler>\r
+               </Compiler>\r
+               <Linker>\r
+                       <Linker Name="MapFile">0</Linker>\r
+                       <Linker Name="OutputObjs">0</Linker>\r
+                       <Linker Name="GenerateHpps">False</Linker>\r
+                       <Linker Name="ConsoleApp">1</Linker>\r
+                       <Linker Name="DebugInfo">False</Linker>\r
+                       <Linker Name="RemoteSymbols">False</Linker>\r
+                       <Linker Name="GenerateDRC">False</Linker>\r
+                       <Linker Name="MinStackSize">16384</Linker>\r
+                       <Linker Name="MaxStackSize">1048576</Linker>\r
+                       <Linker Name="ImageBase">4194304</Linker>\r
+                       <Linker Name="ExeDescription"></Linker>\r
+               </Linker>\r
+               <Directories>\r
+                       <Directories Name="OutputDir"></Directories>\r
+                       <Directories Name="UnitOutputDir"></Directories>\r
+                       <Directories Name="PackageDLLOutputDir"></Directories>\r
+                       <Directories Name="PackageDCPOutputDir"></Directories>\r
+                       <Directories Name="SearchPath"></Directories>\r
+                       <Directories Name="Packages">vcl;rtl;vclx;dbrtl;adortl;vcldb;bdertl;vcldbx;teeui;teedb;tee;ibxpress;visualclx;visualdbclx;dsnap;vclactnband</Directories>\r
+                       <Directories Name="Conditionals">MSWINDOWS</Directories>\r
+                       <Directories Name="DebugSourceDirs"></Directories>\r
+                       <Directories Name="UsePackages">False</Directories>\r
+               </Directories>\r
+               <Parameters>\r
+                       <Parameters Name="RunParams"></Parameters>\r
+                       <Parameters Name="HostApplication"></Parameters>\r
+                       <Parameters Name="Launcher"></Parameters>\r
+                       <Parameters Name="UseLauncher">False</Parameters>\r
+                       <Parameters Name="DebugCWD"></Parameters>\r
+                       <Parameters Name="Debug Symbols Search Path"></Parameters>\r
+                       <Parameters Name="LoadAllSymbols">True</Parameters>\r
+                       <Parameters Name="LoadUnspecifiedSymbols">False</Parameters>\r
+               </Parameters>\r
+               <Language>\r
+                       <Language Name="ActiveLang"></Language>\r
+                       <Language Name="ProjectLang">$00000000</Language>\r
+                       <Language Name="RootDir"></Language>\r
+               </Language>\r
+               <VersionInfo>\r
+                       <VersionInfo Name="IncludeVerInfo">True</VersionInfo>\r
+                       <VersionInfo Name="AutoIncBuild">False</VersionInfo>\r
+                       <VersionInfo Name="MajorVer">0</VersionInfo>\r
+                       <VersionInfo Name="MinorVer">2</VersionInfo>\r
+                       <VersionInfo Name="Release">21</VersionInfo>\r
+                       <VersionInfo Name="Build">0</VersionInfo>\r
+                       <VersionInfo Name="Debug">False</VersionInfo>\r
+                       <VersionInfo Name="PreRelease">False</VersionInfo>\r
+                       <VersionInfo Name="Special">False</VersionInfo>\r
+                       <VersionInfo Name="Private">False</VersionInfo>\r
+                       <VersionInfo Name="DLL">False</VersionInfo>\r
+                       <VersionInfo Name="Locale">1033</VersionInfo>\r
+                       <VersionInfo Name="CodePage">1252</VersionInfo>\r
+               </VersionInfo>\r
+               <VersionInfoKeys>\r
+                       <VersionInfoKeys Name="CompanyName">GPSBabel Makers</VersionInfoKeys>\r
+                       <VersionInfoKeys Name="FileDescription">GPSBabel Windows Frontend</VersionInfoKeys>\r
+                       <VersionInfoKeys Name="FileVersion">0.2.21.0</VersionInfoKeys>\r
+                       <VersionInfoKeys Name="InternalName"></VersionInfoKeys>\r
+                       <VersionInfoKeys Name="LegalCopyright">(C) 2005-2008 Olaf Klein (o.b.klein@gpsbabel.org)</VersionInfoKeys>\r
+                       <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>\r
+                       <VersionInfoKeys Name="OriginalFilename">GPSBabelGUI.exe</VersionInfoKeys>\r
+                       <VersionInfoKeys Name="ProductName">GPSBabel</VersionInfoKeys>\r
+                       <VersionInfoKeys Name="ProductVersion">1.3.x</VersionInfoKeys>\r
+                       <VersionInfoKeys Name="Comments"></VersionInfoKeys>\r
+               </VersionInfoKeys>  <Excluded_Packages>\r
+      <Excluded_Packages Name="c:\program files (x86)\borland\bds\4.0\Bin\dclib100.bpl">Borland InterBase Express Components</Excluded_Packages>\r
+      <Excluded_Packages Name="c:\program files (x86)\borland\bds\4.0\Bin\dclIntraweb_80_100.bpl">Intraweb 8.0 Design Package for Borland Development Studio 2006</Excluded_Packages>\r
+      <Excluded_Packages Name="c:\program files (x86)\borland\bds\4.0\Bin\dclIndyCore100.bpl">Indy 10 Core Design Time</Excluded_Packages>\r
+      <Excluded_Packages Name="c:\program files (x86)\borland\bds\4.0\Bin\dclsmp100.bpl">Borland Sample Components</Excluded_Packages>\r
+      <Excluded_Packages Name="c:\program files (x86)\borland\bds\4.0\Bin\dclIndyProtocols100.bpl">Indy 10 Protocols Design Time</Excluded_Packages>\r
+      <Excluded_Packages Name="c:\program files (x86)\borland\bds\4.0\Bin\dcltee100.bpl">TeeChart Components</Excluded_Packages>\r
+    </Excluded_Packages>\r
+  </Delphi.Personality>\r
+       <ModelSupport>True</ModelSupport>\r
+</BorlandProject>\r

diff --git a/win32/gui-2/GPSBabelGUI.cfg b/win32/gui-2/GPSBabelGUI.cfg
index 8adc0e882812025cbc16b3a998e1d6ec2dd07a1b..3a53153de786db9f47ff9a89575e46245fcd7494 100644 (file)
--- a/win32/gui-2/GPSBabelGUI.cfg
+++ b/win32/gui-2/GPSBabelGUI.cfg
@@ -1,4 +1,4 @@
--$A-\r
+-$A4\r
 -$B-\r
 -$C-\r
 -$D-\r
@@ -31,5 +31,9 @@
 -M\r
 -$M16384,1048576\r
 -K$00400000\r
--LNc:\programme\borland\delphi4\Lib\r
+-LE"C:\Documents and Settings\Admin\My Documents\Borland Studio Projects\Bpl"\r
+-LN"C:\Documents and Settings\Admin\My Documents\Borland Studio Projects\Bpl"\r
 -DMSWINDOWS\r
+-w-UNSAFE_TYPE\r
+-w-UNSAFE_CODE\r
+-w-UNSAFE_CAST\r

diff --git a/win32/gui-2/GPSBabelGUI.dpr b/win32/gui-2/GPSBabelGUI.dpr
index 9dd0094e0b0ea559ea9de5c39d991c4263b8d5e8..265ba9fa778b8c8a56e662f194ae93ce430ae8ba 100644 (file)
--- a/win32/gui-2/GPSBabelGUI.dpr
+++ b/win32/gui-2/GPSBabelGUI.dpr
@@ -1,6 +1,6 @@
 program GPSBabelGUI;\r
 {\r
-    Copyright (C) 2005-2007 Olaf Klein, o.b.klein@gpsbabel.org\r
+    Copyright (C) 2005-2008 Olaf Klein, o.b.klein@gpsbabel.org\r
 \r
     This program is free software; you can redistribute it and/or modify\r
     it under the terms of the GNU General Public License as published by\r
@@ -17,6 +17,22 @@ program GPSBabelGUI;
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111 USA\r
 }\r
 \r
+{%TogetherDiagram 'ModelSupport_GPSBabelGUI\default.txaPackage'}\r
+{%TogetherDiagram 'ModelSupport_GPSBabelGUI\filter\default.txaPackage'}\r
+{%TogetherDiagram 'ModelSupport_GPSBabelGUI\delphi\default.txaPackage'}\r
+{%TogetherDiagram 'ModelSupport_GPSBabelGUI\options\default.txaPackage'}\r
+{%TogetherDiagram 'ModelSupport_GPSBabelGUI\common\default.txaPackage'}\r
+{%TogetherDiagram 'ModelSupport_GPSBabelGUI\about\default.txaPackage'}\r
+{%TogetherDiagram 'ModelSupport_GPSBabelGUI\utils\default.txaPackage'}\r
+{%TogetherDiagram 'ModelSupport_GPSBabelGUI\main\default.txaPackage'}\r
+{%TogetherDiagram 'ModelSupport_GPSBabelGUI\gnugettext\default.txaPackage'}\r
+{%TogetherDiagram 'ModelSupport_GPSBabelGUI\gnugettextDx\default.txaPackage'}\r
+{%TogetherDiagram 'ModelSupport_GPSBabelGUI\GPSBabelGUI\default.txaPackage'}\r
+{%TogetherDiagram 'ModelSupport_GPSBabelGUI\select\default.txaPackage'}\r
+{%TogetherDiagram 'ModelSupport_GPSBabelGUI\default.txvpck'}\r
+{%TogetherDiagram 'ModelSupport_GPSBabelGUI\main\default.txvpck'}\r
+{%TogetherDiagram 'ModelSupport_GPSBabelGUI\GPSBabelGUI\default.txvpck'}\r
+\r
 uses\r
   gnugettext in 'gnugettext.pas',\r
   gnugettextDx in 'gnugettextDx.pas',\r
@@ -48,6 +64,7 @@ begin
 {$ENDIF}\r
 \r
   Application.Initialize;\r
+  Application.Title := 'GPSBabelGUI-2';\r
   Application.CreateForm(TfrmMain, frmMain);\r
   Application.Run;\r
 end.\r

diff --git a/win32/gui-2/GPSBabelGUI.res b/win32/gui-2/GPSBabelGUI.res
index c86993a01ee216c1c28d91ee28e08054aeeb10d3..9757406105fd0f19d7d25159bf9749288393012f 100644 (file)
Binary files a/win32/gui-2/GPSBabelGUI.res and b/win32/gui-2/GPSBabelGUI.res differ

diff --git a/win32/gui-2/Makefile b/win32/gui-2/Makefile
index 691c7915f344525f8b0efda1cac0e8aa7947818e..fa311d5e26d1ed61a83abbd3fb17a9ad6d40c482 100644 (file)
--- a/win32/gui-2/Makefile
+++ b/win32/gui-2/Makefile
@@ -22,12 +22,12 @@ LANG = \
   locale\fr\LC_MESSAGES\delphi.mo \\r
   locale\fr\LC_MESSAGES\default.mo \\r
   locale\fr\LC_MESSAGES\gpsbabel.mo \\r
-  locale\it\LC_MESSAGES\delphi.mo \\r
-  locale\it\LC_MESSAGES\default.mo \\r
-  locale\it\LC_MESSAGES\gpsbabel.mo \\r
   locale\hu\LC_MESSAGES\delphi.mo \\r
   locale\hu\LC_MESSAGES\default.mo \\r
-  locale\hu\LC_MESSAGES\gpsbabel.mo\r
+  locale\hu\LC_MESSAGES\gpsbabel.mo \\r
+  locale\it\LC_MESSAGES\delphi.mo \\r
+  locale\it\LC_MESSAGES\default.mo \\r
+  locale\it\LC_MESSAGES\gpsbabel.mo\r
 \r
 .suffixes: .po\r
 \r
@@ -64,4 +64,5 @@ clean:
        rm -f locale\es\LC_MESSAGES\*.mo\r
        rm -f locale\fr\LC_MESSAGES\*.mo\r
        rm -f locale\hu\LC_MESSAGES\*.mo\r
+       rm -f locale\it\LC_MESSAGES\*.mo\r
 \r

diff --git a/win32/gui-2/README.gui b/win32/gui-2/README.gui
index 220ac043f6783e3ee198c31c2da7431c63e09a61..60c4cc96617b999cfd758328abbaaae6e796a0b4 100644 (file)
--- a/win32/gui-2/README.gui
+++ b/win32/gui-2/README.gui
@@ -61,10 +61,4 @@ the snapshots.
 * Compiling from source *\r
 -------------------------\r
 \r
-Currently the gui is developed under Delphi 4. Other releases of Delphi are\r
-tested but are not used because of backward compatibility. If you want to help\r
-us and Delphi is not in your software collection, "Delphi 6 Personal Edition"\r
-would be the cheapest (or free) way.\r
-\r
-\r
-\r
+Currently the GUI is developed with Turbo Delphi 2006, a free release.\r

diff --git a/win32/gui-2/about.dfm b/win32/gui-2/about.dfm
index da7417a420d02497e7c9f9a6225fbeb2cb903f02..67094dcba11968fcc0ac9ff36246144038a747f9 100644 (file)
Binary files a/win32/gui-2/about.dfm and b/win32/gui-2/about.dfm differ

diff --git a/win32/gui-2/about.pas b/win32/gui-2/about.pas
index ecc118f9771be3de738e396d8103ce6ea9c622f0..50ebe27cce67510545ad25eba3049d88d77fcdda 100644 (file)
--- a/win32/gui-2/about.pas
+++ b/win32/gui-2/about.pas
@@ -88,6 +88,7 @@ begin
   lbxTranslators.Items.Add(_('French') + ' ' +  _('by') + ' Lilian Morinon');\r
   lbxTranslators.Items.Add(_('Spanish') + ' ' + _('by') + ' Daniel Diaz');\r
   lbxTranslators.Items.Add(_('Hungarian') + ' ' + _('by') + ' Sprok Bence');\r
+  lbxTranslators.Items.Add(_('Italian') + ' ' + _('by') + ' Michele Locati');\r
 end;\r
 \r
 procedure TfrmAbout.lbURLMouseMove(Sender: TObject; Shift: TShiftState; X,\r

diff --git a/win32/gui-2/common.pas b/win32/gui-2/common.pas
index 9303350c33a30f02a859a3be6a57a86536bea2fe..fe9410568b389c34bb227602924c260d352515a2 100644 (file)
--- a/win32/gui-2/common.pas
+++ b/win32/gui-2/common.pas
@@ -1,7 +1,7 @@
 unit common;\r
 \r
 {\r
-    Copyright (C) 2005-2007 Olaf Klein, o.b.klein@gpsbabel.org\r
+    Copyright (C) 2005-2008 Olaf Klein, o.b.klein@gpsbabel.org\r
 \r
     This program is free software; you can redistribute it and/or modify\r
     it under the terms of the GNU General Public License as published by\r
@@ -115,7 +115,7 @@ type
   public\r
     Capas: Integer;\r
     property Name : String read FName;\r
-    property Description : String read FDescription;\r
+    property Description : String read FDescription write FDescription;\r
     property Ext : String read FExt;\r
     property ReadAny : Boolean read CanReadAny;\r
     property WriteAny : Boolean read CanWriteAny;\r
@@ -461,7 +461,11 @@ begin
       2:\r
         name := StrPas(cin);\r
       3:\r
-        ext := StrPas(cin);\r
+        begin\r
+          ext := StrPas(cin);\r
+          while (Pos('.', ext) <> 0) do\r
+            System.Delete(ext, Pos('.', ext), 1);\r
+        end\r
     else begin\r
       comment := StrPas(cin);\r
       if (Length(comment) = 0) or (Length(name) = 0) then break;\r
@@ -578,5 +582,6 @@ initialization
   gpsbabel_exe := SysUtils.ExtractFilePath(ParamStr(0)) + SGPSBabelExeFilename;\r
   SGPSBabelGUIVersion := GetFileVersion(ParamStr(0));\r
 //gpsbabel_ini := Open_gpsbabel_ini();\r
+  DecimalSeparator := '.';\r
 \r
 end.\r

diff --git a/win32/gui-2/filter.dfm b/win32/gui-2/filter.dfm
index a6a38a91c4e2e4b4571612a63d2835ce0f867d3b..ee535ff5c06cd7c48dee75e8abe656bd70e7e5d4 100644 (file)
Binary files a/win32/gui-2/filter.dfm and b/win32/gui-2/filter.dfm differ

diff --git a/win32/gui-2/filter.pas b/win32/gui-2/filter.pas
index 82497865de90305cfe6e80c09a5e1ed014970ab6..274d8c930f745afc36b04655e936cedf132a6bd2 100644 (file)
--- a/win32/gui-2/filter.pas
+++ b/win32/gui-2/filter.pas
@@ -1,7 +1,7 @@
 unit filter;\r
 \r
 {\r
-    Copyright (C) 2005-2007 Olaf Klein, o.b.klein@gpsbabel.org\r
+    Copyright (C) 2005-2008 Olaf Klein, o.b.klein@gpsbabel.org\r
 \r
     This program is free software; you can redistribute it and/or modify\r
     it under the terms of the GNU General Public License as published by\r

diff --git a/win32/gui-2/gpsbabel.iss b/win32/gui-2/gpsbabel.iss
index d703b5e7afc1b0919f8950ffc65be3a06e636f38..944a26fbc0078a9d5ffb309cb8c7fd1c9784506d 100644 (file)
--- a/win32/gui-2/gpsbabel.iss
+++ b/win32/gui-2/gpsbabel.iss
@@ -1,8 +1,8 @@
 ; Script generated by the Inno Setup Script Wizard.\r
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!\r
 \r
-#define Version "1.3.5"\r
-#define Release "-beta20070807"\r
+#define Version "1.3.6"\r
+#define Release "-beta20080514"\r
 \r
 [Setup]\r
 AppName=GPSBabel\r

diff --git a/win32/gui-2/main.dfm b/win32/gui-2/main.dfm
index 873cc246c7c163a28be98b1391dc0194d6e97a83..7b20341bfe7ae7b6a37982191880cf3dd7aacff7 100644 (file)
Binary files a/win32/gui-2/main.dfm and b/win32/gui-2/main.dfm differ

diff --git a/win32/gui-2/main.pas b/win32/gui-2/main.pas
index 6e2f9de5da5ab22d18b525b7653be4b1a8aa696d..eb7b22dca6283820d6ba6a5cd81e4d18d8594df0 100644 (file)
--- a/win32/gui-2/main.pas
+++ b/win32/gui-2/main.pas
@@ -3,7 +3,7 @@ unit main;
 {\r
     GPSBabelGUI main unit/formular\r
 \r
-    Copyright (C) 2005-2007 Olaf Klein, o.b.klein@gpsbabel.org\r
+    Copyright (C) 2005-2008 Olaf Klein, o.b.klein@gpsbabel.org\r
 \r
     This program is free software; you can redistribute it and/or modify\r
     it under the terms of the GNU General Public License as published by\r
@@ -26,7 +26,8 @@ uses
   gnugettext, TypInfo, delphi, \r
   Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs,\r
   StdCtrls, Buttons, ExtCtrls,\r
-  common, utils, ImgList, ActnList, Menus, ComCtrls, ToolWin;\r
+  common, utils, ImgList, ActnList, Menus, ComCtrls, ToolWin, ActnMan,\r
+  ActnColorMaps;\r
 \r
 type\r
   TfrmMain = class(TForm)\r
@@ -139,6 +140,7 @@ type
     pmnuFilter: TMenuItem;\r
     btnFilter: TBitBtn;\r
     btnProcess: TBitBtn;\r
+    XPColorMap1: TXPColorMap;\r
     procedure FormShow(Sender: TObject);\r
     procedure FormCreate(Sender: TObject);\r
     procedure OpenButtonClick(Sender: TObject);\r
@@ -338,9 +340,21 @@ begin
   cbInputLang.ItemIndex := 0;\r
   cbOutputLang.ItemIndex := 0;\r
 \r
-  cbWaypoints.Checked := StrToBool(ReadProfile(cbWaypoints.Tag));\r
-  cbTracks.Checked := StrToBool(ReadProfile(cbTracks.Tag));\r
-  cbRoutes.Checked := StrToBool(ReadProfile(cbRoutes.Tag));\r
+  try\r
+    cbWaypoints.Checked := StrToBool(ReadProfile(cbWaypoints.Tag));\r
+  except\r
+    cbWaypoints.Checked := True;\r
+  end;\r
+  try\r
+    cbTracks.Checked := StrToBool(ReadProfile(cbTracks.Tag));\r
+  except\r
+    cbTracks.Checked := False;\r
+  end;\r
+  try\r
+    cbRoutes.Checked := StrToBool(ReadProfile(cbRoutes.Tag));\r
+  except\r
+    cbRoutes.Checked := False;\r
+  end;\r
 \r
   acCopySelected.Enabled := False;\r
   acSelectAll.Enabled := False;\r
@@ -440,7 +454,14 @@ begin
     else\r
       OK := Cap.WriteAny;\r
     if OK then\r
+    begin\r
+      if (Cap.Ext <> '') and (AnsiPos('.' + Cap.Ext, Cap.Description) = 0) then\r
+      begin\r
+        Cap.Description := Cap.Description + ' (.' + Cap.Ext + ')'; \r
+      end;\r
+      \r
       Target.Items.AddObject(Cap.Description, Cap);\r
+    end;\r
   end;\r
 \r
   s := ReadProfile(Target.Tag);\r
@@ -455,25 +476,41 @@ var
   i: Integer;\r
   cap : TCapability;\r
 begin\r
+  edInputFile.SetFocus;\r
   dlgFileOpen.Filter := '';\r
-  dlgFileOpen.DefaultExt := '*.*';\r
-\r
-  s:='';\r
-  if (cbInputFormat.ItemIndex <> -1 ) then  begin\r
-    cap:= TCapability(cbInputFormat.Items.Objects[cbInputFormat.ItemIndex]);\r
-    ext := cap.Ext;\r
-    if (Length(ext)>0) then\r
-       s := cbInputFormat.Text + '|*.' + ext + '|';\r
+  dlgFileOpen.DefaultExt := '';\r
+\r
+  s := '';\r
+  if (cbInputFormat.ItemIndex <> -1 ) then\r
+  begin\r
+    cap := FCaps.GetCapabilityByName(cbInputFormat.Text);\r
+    if (cap.Ext <> '') then\r
+    begin\r
+      s := Format('%s|*.%s|', [cbInputFormat.Text, cap.Ext]);\r
+      dlgFileOpen.DefaultExt := '*.' + cap.Ext;\r
+    end;\r
   end;\r
   s := s + _('All files (*.*)|*.*');\r
 \r
   dlgFileOpen.Filter := s;\r
+\r
+  if (dlgFileOpen.InitialDir = '') then\r
+  begin\r
+    dlgFileOpen.InitialDir := SysUtils.ExtractFilePath(dlgFileSave.FileName);\r
+    if (dlgFileOpen.InitialDir = '') then\r
+      dlgFileOpen.InitialDir := dlgFileSave.InitialDir;\r
+    if (dlgFileOpen.InitialDir = '') then\r
+      dlgFileOpen.InitialDir := GetCurrentDir;\r
+  end;\r
+\r
   if not SELF.dlgFileOpen.Execute then Exit;\r
 \r
   edInputFile.Text := '';\r
   for i := 0 to dlgFileOpen.Files.Count - 1 do\r
   begin\r
     s := dlgFileOpen.Files[i];\r
+    if (i = 0) then\r
+      dlgFileSave.InitialDir := ExtractFilePath(s);\r
     if (s[1] <> '"') or (s[Length(s)] <> '"') then\r
       s := AnsiQuotedStr(s, '"');\r
     if (edInputFile.Text <> '') then edInputFile.Text := edInputFile.Text + ', ';\r
@@ -603,22 +640,41 @@ end;
 procedure TfrmMain.sbSaveFileClick(Sender: TObject);\r
 var\r
   s: string;\r
-  cap : TCapability;\r
+  cap: TCapability;\r
 begin\r
+  edOutputFile.SetFocus;\r
   dlgFileSave.Filter := '';\r
-  dlgFileSave.DefaultExt := '*.*';\r
+  dlgFileSave.DefaultExt := '';\r
 \r
-  s:='';\r
-  if (cbOutputFormat.ItemIndex <> -1) then begin\r
-    cap:=FCaps.Capability[cbOutputFormat.ItemIndex];\r
-    s := Format('%s|%s',[cbOutputFormat.Text,cap.Ext,cap.Ext]);\r
+  s := '';\r
+  if (cbOutputFormat.ItemIndex <> -1) then\r
+  begin\r
+    cap := FCaps.GetCapabilityByName(cbOutputFormat.Text);\r
+    if (cap.Ext <> '') then\r
+    begin\r
+      s := Format('%s|*.%s|',[cbOutputFormat.Text, cap.Ext]);\r
+      dlgFileSave.DefaultExt := '*.' + cap.Ext;\r
+    end;\r
   end;\r
   s := s + _('All files|*.*');\r
 \r
   dlgFileSave.Filter := s;\r
+\r
+\r
+  if (dlgFileSave.InitialDir = '') then\r
+  begin\r
+    dlgFileSave.InitialDir := SysUtils.ExtractFilePath(dlgFileOpen.FileName);\r
+    if (dlgFileSave.InitialDir = '') then\r
+      dlgFileSave.InitialDir := dlgFileOpen.InitialDir;\r
+    if (dlgFileSave.InitialDir = '') then\r
+      dlgFileSave.InitialDir := GetCurrentDir;\r
+  end;\r
+  \r
   if not SELF.dlgFileSave.Execute then Exit;\r
 \r
   edOutputFile.Text := dlgFileSave.FileName;\r
+  dlgFileSave.InitialDir := SysUtils.ExtractFilePath(dlgFileSave.FileName);\r
+\r
   CheckInput;\r
 end;\r
 \r
@@ -635,6 +691,7 @@ var
   sp: PChar;\r
   cap : TCapability;\r
 begin\r
+  memoOutput.SetFocus;\r
   acLetsGo.Enabled := False;\r
   try\r
     acFinalizeDropDownsExecute(nil);\r

diff --git a/win32/gui-2/options.dfm b/win32/gui-2/options.dfm
index e9114954d2f614314e10de207a88080ea1869eb8..6863765accd9bd220f3f10418b86127a63b3d5f5 100644 (file)
Binary files a/win32/gui-2/options.dfm and b/win32/gui-2/options.dfm differ

diff --git a/win32/gui-2/options.pas b/win32/gui-2/options.pas
index f90744526139514e42373cdb3ac1694f9046070c..454012e369cefb9f7922af81127ce661b18a1fc7 100644 (file)
--- a/win32/gui-2/options.pas
+++ b/win32/gui-2/options.pas
@@ -1,7 +1,7 @@
 unit options;\r
 \r
 {\r
-    Copyright (C) 2005-2007 Olaf Klein, o.b.klein@gpsbabel.org\r
+    Copyright (C) 2005-2008 Olaf Klein, o.b.klein@gpsbabel.org\r
 \r
     This program is free software; you can redistribute it and/or modify\r
     it under the terms of the GNU General Public License as published by\r

diff --git a/win32/gui-2/select.dfm b/win32/gui-2/select.dfm
index 7544131b3912462d84660a0917a37e0a1aab7574..3187153996c90a6c2d7bd2758a1db5d6e7dd8223 100644 (file)
Binary files a/win32/gui-2/select.dfm and b/win32/gui-2/select.dfm differ

diff --git a/win32/gui-2/select.pas b/win32/gui-2/select.pas
index eb8f27d372dc1dc418e4bd31ca6b099e8867c683..079f91fa0622c55157c0c84c515b81026eab0269 100644 (file)
--- a/win32/gui-2/select.pas
+++ b/win32/gui-2/select.pas
@@ -1,7 +1,7 @@
 unit select;\r
 \r
 {\r
-    Copyright (C) 2005-2007 Olaf Klein, o.b.klein@gpsbabel.org\r
+    Copyright (C) 2005-2008 Olaf Klein, o.b.klein@gpsbabel.org\r
 \r
     This program is free software; you can redistribute it and/or modify\r
     it under the terms of the GNU General Public License as published by\r
@@ -103,6 +103,7 @@ begin
       if (CompareText(s, 'fr') = 0) then sx := _('French') else\r
       if (CompareText(s, 'en') = 0) then sx := _('English') else\r
       if (CompareText(s, 'hu') = 0) then sx := _('Hungarian') else\r
+      if (CompareText(s, 'it') = 0) then sx := _('Italian') else\r
         sx := '???';\r
 \r
       sx := Format('%s - %s', [s, sx]);\r

diff --git a/win32/gui-2/utils.pas b/win32/gui-2/utils.pas
index a6a54d11c1001d8199454217d0d4ccb89a43b5dc..cd947024f64db217af6df0650548bda5baae2787 100644 (file)
--- a/win32/gui-2/utils.pas
+++ b/win32/gui-2/utils.pas
@@ -1,7 +1,7 @@
 unit utils;\r
 \r
 {\r
-    Copyright (C) 2005-2007 Olaf Klein, o.b.klein@gpsbabel.org\r
+    Copyright (C) 2005-2008 Olaf Klein, o.b.klein@gpsbabel.org\r
 \r
     This program is free software; you can redistribute it and/or modify\r
     it under the terms of the GNU General Public License as published by\r